From b61cb920533e042e2955b0530bec5084e3474e5d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Florian=20M=C3=BCllner?= Date: Wed, 11 Mar 2015 22:11:25 +0100 Subject: [PATCH] calendar: Add public close() method Currently a message can only be closed by its close button. However as we want to make a section's clear action synonymous with clicking the close button of each individual message in the list, we will need to expose the close action, so add a corresponding method. https://bugzilla.gnome.org/show_bug.cgi?id=746027 --- js/ui/calendar.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/js/ui/calendar.js b/js/ui/calendar.js index af349665b..dda733c7c 100644 --- a/js/ui/calendar.js +++ b/js/ui/calendar.js @@ -1017,16 +1017,17 @@ const Message = new Lang.Class({ this._bodyStack.add_actor(this.bodyLabel.actor); this.setBody(body); - this._closeButton.connect('clicked', Lang.bind(this, - function() { - this.emit('close'); - })); + this._closeButton.connect('clicked', Lang.bind(this, this.close)); this.actor.connect('notify::hover', Lang.bind(this, this._sync)); this.actor.connect('clicked', Lang.bind(this, this._onClicked)); this.actor.connect('destroy', Lang.bind(this, this._onDestroy)); this._sync(); }, + close: function() { + this.emit('close'); + }, + setIcon: function(actor) { this._iconBin.child = actor; this._iconBin.visible = (actor != null); @@ -1158,7 +1159,7 @@ const Message = new Lang.Class({ if (keysym == Clutter.KEY_Delete || keysym == Clutter.KEY_KP_Delete) { - this.emit('close'); + this.close(); return Clutter.EVENT_STOP; } return Clutter.EVENT_PROPAGATE; -- 2.39.5